Use GPOINTER_TO_UINT()/GUINT_TO_POINTER() for guints. (#158420, Morten

2004-11-15  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkimagemenuitem.c (gtk_image_menu_item_screen_changed):
	* gtk/gtkbutton.c (gtk_button_screen_changed): Use
	GPOINTER_TO_UINT()/GUINT_TO_POINTER() for guints.  (#158420,
	Morten Welinder)

diff --git a/ChangeLog b/ChangeLog
index 83248c621a3885a9cf3bf9db560b21058448671f..ded0de74a7329d25e9e3709867d8bd2c2720173d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkimagemenuitem.c (gtk_image_menu_item_screen_changed): 
+       * gtk/gtkbutton.c (gtk_button_screen_changed): Use 
+       GPOINTER_TO_UINT()/GUINT_TO_POINTER() for guints.  (#158420,
+       Morten Welinder)
+
 Mon Nov 15 17:17:17 2004  Manish Singh  <yosh@gimp.org>
 
        * configure.in: Output Makefile for the pixbuf engine directory.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 83248c621a3885a9cf3bf9db560b21058448671f..ded0de74a7329d25e9e3709867d8bd2c2720173d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2004-11-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkimagemenuitem.c (gtk_image_menu_item_screen_changed): 
+       * gtk/gtkbutton.c (gtk_button_screen_changed): Use 
+       GPOINTER_TO_UINT()/GUINT_TO_POINTER() for guints.  (#158420,
+       Morten Welinder)
+
 Mon Nov 15 17:17:17 2004  Manish Singh  <yosh@gimp.org>
 
        * configure.in: Output Makefile for the pixbuf engine directory.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 83248c621a3885a9cf3bf9db560b21058448671f..ded0de74a7329d25e9e3709867d8bd2c2720173d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2004-11-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkimagemenuitem.c (gtk_image_menu_item_screen_changed): 
+       * gtk/gtkbutton.c (gtk_button_screen_changed): Use 
+       GPOINTER_TO_UINT()/GUINT_TO_POINTER() for guints.  (#158420,
+       Morten Welinder)
+
 Mon Nov 15 17:17:17 2004  Manish Singh  <yosh@gimp.org>
 
        * configure.in: Output Makefile for the pixbuf engine directory.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 83248c621a3885a9cf3bf9db560b21058448671f..ded0de74a7329d25e9e3709867d8bd2c2720173d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2004-11-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkimagemenuitem.c (gtk_image_menu_item_screen_changed): 
+       * gtk/gtkbutton.c (gtk_button_screen_changed): Use 
+       GPOINTER_TO_UINT()/GUINT_TO_POINTER() for guints.  (#158420,
+       Morten Welinder)
+
 Mon Nov 15 17:17:17 2004  Manish Singh  <yosh@gimp.org>
 
        * configure.in: Output Makefile for the pixbuf engine directory.

diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index a60314ce59c33eac8e5b2e0e0f0e25dee305e7cb..3f958015a42dd6e3e3a94fbdb8ba4cbe0a09ab0d 100644 (file)
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -1696,8 +1696,8 @@ gtk_button_screen_changed (GtkWidget *widget,
   settings = gtk_widget_get_settings (widget);
 
   show_image_connection = 
-    GPOINTER_TO_INT (g_object_get_data (G_OBJECT (settings), 
-                                       "gtk-button-connection"));
+    GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (settings), 
+                                        "gtk-button-connection"));
   
   if (show_image_connection)
     return;
@@ -1707,7 +1707,7 @@ gtk_button_screen_changed (GtkWidget *widget,
                      G_CALLBACK (gtk_button_setting_changed), 0);
   g_object_set_data (G_OBJECT (settings), 
                     "gtk-button-connection",
-                    GINT_TO_POINTER (show_image_connection));
+                    GUINT_TO_POINTER (show_image_connection));
 
   show_image_change_notify (GTK_BUTTON (widget));
 }

diff --git a/gtk/gtkimagemenuitem.c b/gtk/gtkimagemenuitem.c
index 0690a33511fb898c36b5a62da4ecba2f7aaab1ec..134e766bd58b0bc139ec4acad95e8d6f054bddaf 100644 (file)
--- a/gtk/gtkimagemenuitem.c
+++ b/gtk/gtkimagemenuitem.c
@@ -589,8 +589,8 @@ gtk_image_menu_item_screen_changed (GtkWidget *widget,
   settings = gtk_widget_get_settings (widget);
   
   show_image_connection = 
-    GPOINTER_TO_INT (g_object_get_data (G_OBJECT (settings), 
-                                       "gtk-image-menu-item-connection"));
+    GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (settings), 
+                                        "gtk-image-menu-item-connection"));
   
   if (show_image_connection)
     return;
@@ -600,7 +600,7 @@ gtk_image_menu_item_screen_changed (GtkWidget *widget,
                      G_CALLBACK (gtk_image_menu_item_setting_changed), 0);
   g_object_set_data (G_OBJECT (settings), 
                     "gtk-image-menu-item-connection",
-                    GINT_TO_POINTER (show_image_connection));
+                    GUINT_TO_POINTER (show_image_connection));
 
   show_image_change_notify (GTK_IMAGE_MENU_ITEM (widget));
 }